Override static in return types with self in final classes by rekmixa · Pull Request #17724 · php/php-src

rekmixa · 2025-02-06T18:12:53Z

This PR adds the ability to replace static with self in the return types in the final classes, provided that the prototype of the final class has a static return method.

Example of how it should work:

interface A {
    public function someMethod(): static;
}
final class B implements A {
    public function someMethod(): self { /** */ }
}

There are no changes that break backward compatibility or covariance logic.

More information in the issue: #17725

…verriding static with self in non-final classes

…self in final classes

…n final classes

…ype_of_type

dstogov

@rekmixa please define what exactly you propose. (e.g. some code didn't work as expected and started to work after the patch).

I'm not sure if this patch is a fix or a new feature that requries RFC and discussion, how it's going to coexists with type variance, etc

@iluuu1994 @nielsdos @arnaud-lb please take care about this PR.

Zend/zend_inheritance.c

Zend/tests/type_declarations/override_another_type_in_final_class_with_union_type.phpt

…tests to folder Zend/tests/type_declarations/variance/override_static_with_self

ndossche

Conceptually, this seems correct to me. Please see my preliminary review comments.

Zend/zend_inheritance.c

.../override_static_with_self/override_static_type_with_self_in_non_final_class_with_trait.phpt

...verride_static_with_self/override_static_type_with_self_in_final_class_with_union_types.phpt

Zend/zend_inheritance.c

…ability to replace static with self

rekmixa · 2025-02-13T07:30:30Z

@nielsdos do i need to squash all commits in this PR?

…_union_types.phpt

ndossche · 2025-02-14T21:57:16Z

do i need to squash all commits in this PR?

No, we will squash on merge. Squashing makes it harder for us to review what has changed since our reviews.

ndossche

I think this is right now, thanks. But I haven't worked with this code a lot, so this needs more eyes, especially since this is deep engine code.
cc @iluuu1994 @arnaud-lb

This may also need discussion on the ML so we know for sure there are no objections.

Requested changes were performed

rekmixa · 2025-02-15T16:20:01Z

This may also need discussion on the ML so we know for sure there are no objections.

By the way, i already created discussion in the ML: https://externals.io/message/126367

ndossche · 2025-02-15T16:29:44Z

This may also need discussion on the ML so we know for sure there are no objections.

By the way, i already created discussion in the ML: https://externals.io/message/126367

Ah good to know, I missed this.

Zend/zend_inheritance.c

…ng for static before checking for final

Zend/zend_inheritance.c

…e tests

iluuu1994

LGTM now. Thank you @rekmixa! Given there were no objections on the list, it should be ok to merge this in a week or so.

Zend/zend_inheritance.c

rekmixa · 2025-02-19T14:18:08Z

LGTM now. Thank you @rekmixa! Given there were no objections on the list, it should be ok to merge this in a week or so.

Thanks for your comments. Can you tell me if this PR will be merged in 8.4 or 8.5?

iluuu1994 · 2025-02-19T14:19:11Z

8.5. Stable branches only receive bug fixes.

iluuu1994 · 2025-03-05T10:32:35Z

Thanks @rekmixa!

rekmixa added 3 commits February 6, 2025 21:39

add override_static_type_with_self_in_final_class.phpt

79e4f25

allow to override static return types with self in final classes

4ec78c1

fix checking covariant on override static with self & add tests for o…

27f8e02

…verriding static with self in non-final classes

rekmixa requested a review from dstogov as a code owner February 6, 2025 18:12

github-actions bot added the Category: Engine label Feb 6, 2025

rekmixa mentioned this pull request Feb 6, 2025

Override static in return types with self in final classes #17725

Closed

rekmixa and others added 10 commits February 6, 2025 23:25

change test override_static_type_with_self_in_final_class.phpt

218d03d

fix tests for overriding static with self in non-final classes

f2a4a2d

fix tests for overriding static with self in non-final classes

ceb8396

php#17725 add more tests

7fe477d

php#17725 change way to checking availability to replace static with …

6b3ca17

…self in final classes

php#17725 add more tests for union types

31c53e4

php#17725 fix checking inheritance while replacing static with self i…

baa7b49

…n final classes

php#17725 fix checking inheritance while replacing static with self i…

1d353f8

…n final classes

php#17725 add additional check for mask MAY_BE_STATIC

9369f53

php#17725 optimize getting proto_type full mask in zend_is_class_subt…

8b5f894

…ype_of_type

dstogov reviewed Feb 11, 2025

View reviewed changes

Zend/zend_inheritance.c Outdated Show resolved Hide resolved

Zend/tests/type_declarations/override_another_type_in_final_class_with_union_type.phpt Show resolved Hide resolved

rekmixa added 2 commits February 11, 2025 18:48

php#17725 add brackets

573b8de

php#17725 remove unnecessary tests & change test descriptions & move …

2f4bbcb

…tests to folder Zend/tests/type_declarations/variance/override_static_with_self

ndossche previously requested changes Feb 12, 2025

View reviewed changes

php#17725 change tests & change comparing instance of while checking …

8740b58

…ability to replace static with self

rekmixa requested a review from ndossche February 13, 2025 07:34

php#17725 fix test override_static_type_with_self_in_final_class_with…

25184ce

…_union_types.phpt

ndossche reviewed Feb 14, 2025

View reviewed changes

iluuu1994 reviewed Feb 18, 2025

View reviewed changes

Zend/zend_inheritance.c Outdated Show resolved Hide resolved

Zend/zend_inheritance.c Outdated Show resolved Hide resolved

Zend/zend_inheritance.c Outdated Show resolved Hide resolved

michael19 added 2 commits February 19, 2025 12:53

php#17725 rollback moving ZEND_TYPE_FULL_MASK to variable

a77482d

php#17725 remove redundand checking for is_intersection & move checki…

a957dbf

…ng for static before checking for final

iluuu1994 reviewed Feb 19, 2025

View reviewed changes

Zend/zend_inheritance.c Outdated Show resolved Hide resolved

rekmixa added 3 commits February 19, 2025 18:19

php#17725 change checking ability to replace static with self & updat…

1b95868

…e tests

php#17725 remove unlinked_instanceof

66df47f

php#17725 update comment

de34c3e

iluuu1994 approved these changes Feb 19, 2025

View reviewed changes

Zend/zend_inheritance.c Outdated Show resolved Hide resolved

php#17725 remove redundant whitespace change

1dc2def

iluuu1994 closed this in 4f5136c Mar 5, 2025

Conversation

rekmixa commented Feb 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dstogov left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

ndossche left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

rekmixa commented Feb 13, 2025

Uh oh!

ndossche commented Feb 14, 2025

Uh oh!

ndossche left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rekmixa commented Feb 15, 2025

Uh oh!

ndossche commented Feb 15, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

iluuu1994 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

rekmixa commented Feb 19, 2025

Uh oh!

iluuu1994 commented Feb 19, 2025

Uh oh!

iluuu1994 commented Mar 5, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Comments

rekmixa commented Feb 6, 2025 •

edited

Loading

ndossche left a comment •

edited

Loading